Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / NomadNet.git / commits / 13484a6


Commit 13484a665a8519607d2b1b6427f58f4515a7b90d

󰉖 Browse tree at this commit

Parents : 3cd336a
Author : Mark Qvist <mark@unsigned.io>
Date : 2022-05-17T18:37:29+02:00

Improved link rendering and target handling in text blocks and with alignment. Fixes #4.

Changes

1 files changed, 30 insertions(+), 2 deletions(-)

M nomadnet/ui/textui/MicronParser.py +30 -2

Diff

diff --git a/nomadnet/ui/textui/MicronParser.py b/nomadnet/ui/textui/MicronParser.py
index bd52de1..7a8ff7e 100644
--- a/nomadnet/ui/textui/MicronParser.py
+++ b/nomadnet/ui/textui/MicronParser.py
@@ -528,7 +528,6 @@ class LinkableText(urwid.Text):
if self.delegate != None:
self.delegate.handle_link(link_target)
-
def find_next_part_pos(self, pos, part_positions):
for position in part_positions:
if position > pos:
@@ -596,7 +595,12 @@ class LinkableText(urwid.Text):
return key
elif key == "right":
+ old = self._cursor_position
self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
+ if self._cursor_position == old:
+ self._cursor_position = 0
+ return "down"
+
self._invalidate()
elif key == "left":
@@ -641,9 +645,33 @@ class LinkableText(urwid.Text):
if button != 1 or not is_mouse_press(event):
return False
else:
- pos = (y * size[0]) + x
+ (maxcol,) = size
+ translation = self.get_line_translation(maxcol)
+ line_offset = 0
+
+ if self.align == "center":
+ line_offset = translation[y][1][1]-translation[y][0][0]
+ if x < translation[y][0][0]:
+ x = translation[y][0][0]
+
+ if x > translation[y][1][0]+translation[y][0][0]:
+ x = translation[y][1][0]+translation[y][0][0]
+
+ elif self.align == "right":
+ line_offset = translation[y][1][1]-translation[y][0][0]
+ if x < translation[y][0][0]:
+ x = translation[y][0][0]
+
+ else:
+ line_offset = translation[y][0][1]
+ if x > translation[y][0][0]:
+ x = translation[y][0][0]
+
+ pos = line_offset+x
+
self._cursor_position = pos
item = self.find_item_at_pos(self._cursor_position)
+
if item != None:
if isinstance(item, LinkSpec):
self.handle_link(item.link_target)


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────